Auto merge of #3568 - alexcrichton:fix-small, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 20 Jan 2017 16:51:03 +0000 (16:51 +0000)
committerbors <bors@rust-lang.org>
Fri, 20 Jan 2017 16:51:03 +0000 (16:51 +0000)
Update travis token and fix warning


Trivial merge